Complete the privatization of GtkTextAttributes

This was not quite complete, as gtktextattributes.h was still
being included in public headers.

https://bugzilla.gnome.org/show_bug.cgi?id=773903

diff --git a/gtk/gtk-autocleanups.h b/gtk/gtk-autocleanups.h
index 9ea63c6c9bb86b1b6081cc10461044b093d562f5..a46e35a3aef47b10bbb39914070d0f17133f6c6e 100644 (file)
--- a/gtk/gtk-autocleanups.h
+++ b/gtk/gtk-autocleanups.h
@@ -191,7 +191,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkVolumeButton, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPaperSize, gtk_paper_size_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSelectionData, gtk_selection_data_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTargetList, gtk_target_list_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTextAttributes, gtk_text_attributes_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTextIter, gtk_text_iter_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTreeIter, gtk_tree_iter_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTreeRowReference, gtk_tree_row_reference_free)

diff --git a/gtk/gtk.h b/gtk/gtk.h
index 5bc0b540eac66d176148dc9ea24c98c735d0308b..3e4fb4442763d25543ef895ad213246562ca46f8 100644 (file)
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -204,7 +204,6 @@
 #include <gtk/gtkstylecontext.h>
 #include <gtk/gtkstyleprovider.h>
 #include <gtk/gtkswitch.h>
-#include <gtk/gtktextattributes.h>
 #include <gtk/gtktextbuffer.h>
 #include <gtk/gtktextbufferrichtext.h>
 #include <gtk/gtktextchild.h>

diff --git a/gtk/gtktextattributes.h b/gtk/gtktextattributes.h
index b840eeba873be8c961825bb5230f04df01a9a34f..8dedeac440b14b729c15fa8e63dbd8e4dbc2a6da 100644 (file)
--- a/gtk/gtktextattributes.h
+++ b/gtk/gtktextattributes.h
@@ -51,10 +51,6 @@
 #define __GTK_TEXT_ATTRIBUTES_H__
 
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #include <gdk/gdk.h>
 #include <gtk/gtkenums.h>
 

diff --git a/gtk/gtktextiter.h b/gtk/gtktextiter.h
index e56bd84bf183944a138f903740a70aee7928d4ef..368f4f307d178f9ff37817d3b7be5b882f7fe52e 100644 (file)
--- a/gtk/gtktextiter.h
+++ b/gtk/gtktextiter.h
@@ -29,7 +29,6 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#include <gtk/gtktextattributes.h>
 #include <gtk/gtktextchild.h>
 #include <gtk/gtktexttag.h>
 
@@ -219,9 +218,6 @@ gint     gtk_text_iter_get_chars_in_line (const GtkTextIter   *iter);
 GDK_AVAILABLE_IN_ALL
 gint     gtk_text_iter_get_bytes_in_line (const GtkTextIter   *iter);
 
-GDK_AVAILABLE_IN_ALL
-gboolean       gtk_text_iter_get_attributes (const GtkTextIter *iter,
-                                            GtkTextAttributes *values);
 GDK_AVAILABLE_IN_ALL
 PangoLanguage* gtk_text_iter_get_language   (const GtkTextIter *iter);
 GDK_AVAILABLE_IN_ALL

diff --git a/gtk/gtktextiterprivate.h b/gtk/gtktextiterprivate.h
index 1bdc7f755e00e128503618f9b78c33dbaa6eb7c3..4fdf772c863015654ba9ffe7e94e26dda93c69ae 100644 (file)
--- a/gtk/gtktextiterprivate.h
+++ b/gtk/gtktextiterprivate.h
@@ -31,6 +31,7 @@ G_BEGIN_DECLS
 
 #include <gtk/gtktextiter.h>
 #include <gtk/gtktextbtree.h>
+#include <gtk/gtktextattributes.h>
 
 GtkTextLineSegment *_gtk_text_iter_get_indexable_segment      (const GtkTextIter *iter);
 GtkTextLineSegment *_gtk_text_iter_get_any_segment            (const GtkTextIter *iter);
@@ -41,6 +42,8 @@ gboolean            _gtk_text_iter_backward_indexable_segment (GtkTextIter
 gint                _gtk_text_iter_get_segment_byte           (const GtkTextIter *iter);
 gint                _gtk_text_iter_get_segment_char           (const GtkTextIter *iter);
 
+gboolean       gtk_text_iter_get_attributes (const GtkTextIter *iter,
+                                             GtkTextAttributes *values);
 
 /* debug */
 void _gtk_text_iter_check (const GtkTextIter *iter);

diff --git a/gtk/gtktextlayout.h b/gtk/gtktextlayout.h
index 1b7b82684f1616fe503ef2369df6baab283b0342..684d868865cdc718ad95a9c0d3a56257c472532b 100644 (file)
--- a/gtk/gtktextlayout.h
+++ b/gtk/gtktextlayout.h
@@ -89,6 +89,7 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <gtk/gtktextattributes.h>
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtktexttagprivate.h b/gtk/gtktexttagprivate.h
index 56733a253d6262263c55cab4b0f362b819b3620b..75f448d7028621fde397b4c00a3038716e416691 100644 (file)
--- a/gtk/gtktexttagprivate.h
+++ b/gtk/gtktexttagprivate.h
@@ -26,6 +26,7 @@
 #define __GTK_TEXT_TAG_PRIVATE_H__
 
 #include <gtk/gtk.h>
+#include <gtk/gtktextattributes.h>
 
 typedef struct _GtkTextBTreeNode GtkTextBTreeNode;
 

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 9d862f71932a7695db1727c9d553d4dc89c5cdf2..f21ed3138c7c68f1ed956e7aa7402ae0e2a29c4b 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -45,6 +45,7 @@
 #include "gtkselectionprivate.h"
 #include "gtktextbufferrichtext.h"
 #include "gtktextdisplay.h"
+#include "gtktextiterprivate.h"
 #include "gtkimmulticontext.h"
 #include "gtkprivate.h"
 #include "gtktextutil.h"